Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Mon, 28 Jun 2010 13:32:47 +0000 (13:32 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Mon, 28 Jun 2010 13:32:47 +0000 (13:32 +0000)

Trivial merge